More symbol changes in prep for autoconf.

diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.c
index f5e2fa70771b25015a113f8347fdf63c891e676b..a361e438109b50adc4a78520b6376b4e307626d2 100755 (executable)
--- a/gpsbabel/coastexp.c
+++ b/gpsbabel/coastexp.c
@@ -18,7 +18,7 @@
  */
 
 #include "defs.h"
-#if !NO_EXPAT
+#if HAVE_LIBEXPAT
 #include "xmlgeneric.h"
 #include <expat.h>
 static XML_Parser psr;

diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.c
index 2c869f4223470d24f18f3f35cb5620d031e2c217..152e686c6f39e0dac58be878ca30209ba85f093d 100644 (file)
--- a/gpsbabel/ignrando.c
+++ b/gpsbabel/ignrando.c
@@ -27,7 +27,7 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-#if !NO_EXPAT
+#if HAVE_LIBEXPAT
 #include <expat.h>
 #endif
 
@@ -69,7 +69,7 @@ xg_tag_mapping ignr_xml_map[] =
        { NULL,                 0,              NULL }
 };
 
-#if NO_EXPAT
+#if ! HAVE_LIBEXPAT
 
 static void
 ignr_rd_init(const char *fname)

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index 7c568a7a0d15b91e13a14f8177ae79448d042d85..f3d94e63b3eb8f3499d3d148c613afdf83984097 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -1,4 +1,4 @@
-#if !defined(NO_USB)
+#if HAVE_LIBUSB
 /*
     Physical/OS USB layer to talk to libusb.
 
@@ -255,4 +255,4 @@ void garmin_usb_scan(void)
        }
 }
 
-#endif /* !defined(NO_USB) */
+#endif /* HAVE_LIBUSB */